Skip to content

conky: add wayland support#59682

Merged
Duncaen merged 1 commit intovoid-linux:masterfrom
nisheri-ascar:master
Apr 7, 2026
Merged

conky: add wayland support#59682
Duncaen merged 1 commit intovoid-linux:masterfrom
nisheri-ascar:master

Conversation

@nisheri-ascar
Copy link
Copy Markdown

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture: amd64-glibc
image

Superseded by #58820, new version seems to build properly with aarch64 now.

@hosaka
Copy link
Copy Markdown
Contributor

hosaka commented Apr 1, 2026

I think revision should be bumped, like in your original PR.

@oreo639
Copy link
Copy Markdown
Member

oreo639 commented Apr 3, 2026

Can you squash your changes into one commit per package?
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#review

@nisheri-ascar
Copy link
Copy Markdown
Author

i apologize but i am not familiar with using git yet, it seems that my previous commits wasn't removed as i expected it to be squashed.. hmm.. let me figure it out, would it be okay to reopen a new pr?

@oreo639
Copy link
Copy Markdown
Member

oreo639 commented Apr 4, 2026

Preferably not.
You should be able to fix it by doing:

git reset HEAD~5
git add srcpkgs/conky
git commit -m "conky: add wayland support"

Then instead of merging, do git pull --rebase https://github.com/void-linux/void-packages master to pull the upstream commits from the repo.
And when you want to make changes to the commit, use git commit --amend.

@nisheri-ascar nisheri-ascar marked this pull request as draft April 5, 2026 15:36
@nisheri-ascar nisheri-ascar reopened this Apr 5, 2026
@nisheri-ascar nisheri-ascar marked this pull request as ready for review April 5, 2026 15:51
@nisheri-ascar nisheri-ascar reopened this Apr 6, 2026
@nisheri-ascar
Copy link
Copy Markdown
Author

running xlint locally shows no errors, this should be fine now

@Duncaen Duncaen merged commit 3ecf396 into void-linux:master Apr 7, 2026
16 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants